From: bors <bors@rust-lang.org>
Date: Tue, 10 Oct 2017 18:36:48 +0000 (+0000)
Subject: Auto merge of #4581 - tamird:master, r=alexcrichton
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~6^2~10
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=d6843a77b270b72ae49213adcd2217ab1a964694;p=cargo.git

Auto merge of #4581 - tamird:master, r=alexcrichton

cargo_rustc: remove workaround for fixed upstream issue

Fixed in https://github.com/rust-lang/rust/pull/25411. Also, the
removed code is implicated in test failures observed in
https://github.com/rust-lang/rust/pull/44515.

r? @alexcrichton
---

d6843a77b270b72ae49213adcd2217ab1a964694